Autogenerated HTML docs for v1.6.0.2-229-g1293c
diff --git a/git-config.html b/git-config.html index 61a001e..a64b28d 100644 --- a/git-config.html +++ b/git-config.html
@@ -2162,7 +2162,7 @@ </dt> <dd> <p> - Whether to print the diffstat between ORIG_HEAD and merge result + Whether to print the diffstat between ORIG_HEAD and the merge result at the end of the merge. True by default. </p> </dd> @@ -2744,7 +2744,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2008-09-09 01:34:20 UTC +Last updated 2008-09-13 06:06:56 UTC </div> </div> </body>
diff --git a/git-merge.html b/git-merge.html index 3ad4e28..a9ad58d 100644 --- a/git-merge.html +++ b/git-merge.html
@@ -565,7 +565,7 @@ </dt> <dd> <p> - Whether to print the diffstat between ORIG_HEAD and merge result + Whether to print the diffstat between ORIG_HEAD and the merge result at the end of the merge. True by default. </p> </dd> @@ -827,7 +827,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2008-08-24 03:33:55 UTC +Last updated 2008-09-13 06:06:56 UTC </div> </div> </body>
diff --git a/git-web--browse.html b/git-web--browse.html index a1e2511..4d4907e 100644 --- a/git-web--browse.html +++ b/git-web--browse.html
@@ -434,7 +434,7 @@ </div> <h2 id="_note_about_konqueror">Note about konqueror</h2> <div class="sectionbody"> -<div class="para"><p>When <em>konqueror</em> is specified by the a command line option or a +<div class="para"><p>When <em>konqueror</em> is specified by a command line option or a configuration variable, we launch <em>kfmclient</em> to try to open the HTML man page on an already opened konqueror in a new tab if possible.</p></div> <div class="para"><p>For consistency, we also try such a trick if <em>browser.konqueror.path</em> is @@ -476,7 +476,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2008-07-06 05:17:07 UTC +Last updated 2008-09-13 06:06:56 UTC </div> </div> </body>
diff --git a/git-web--browse.txt b/git-web--browse.txt index 36afad8..7f7a45b 100644 --- a/git-web--browse.txt +++ b/git-web--browse.txt
@@ -77,7 +77,7 @@ Note about konqueror -------------------- -When 'konqueror' is specified by the a command line option or a +When 'konqueror' is specified by a command line option or a configuration variable, we launch 'kfmclient' to try to open the HTML man page on an already opened konqueror in a new tab if possible.
diff --git a/git.html b/git.html index 970f457..504182f 100644 --- a/git.html +++ b/git.html
@@ -2025,7 +2025,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2008-08-25 00:33:14 UTC +Last updated 2008-09-13 06:06:57 UTC </div> </div> </body>
diff --git a/git.txt b/git.txt index e178fb5..df420ae 100644 --- a/git.txt +++ b/git.txt
@@ -43,10 +43,11 @@ branch of the `git.git` repository. Documentation for older releases are available here: -* link:v1.6.1/git.html[documentation for release 1.6.1] +* link:v1.6.0.2/git.html[documentation for release 1.6.0.2] * release notes for - link:RelNotes-1.6.1.txt[1.6.1], + link:RelNotes-1.6.0.2.txt[1.6.0.2], + link:RelNotes-1.6.0.1.txt[1.6.0.1], link:RelNotes-1.6.0.txt[1.6.0]. * link:v1.5.6.5/git.html[documentation for release 1.5.6.5]
diff --git a/gitattributes.html b/gitattributes.html index 01c7b26..30d3c5d 100644 --- a/gitattributes.html +++ b/gitattributes.html
@@ -643,7 +643,7 @@ </li> <li> <p> -<tt>java</tt> suitable for source code in the Java lanugage. +<tt>java</tt> suitable for source code in the Java language. </p> </li> <li> @@ -943,7 +943,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2008-09-09 01:34:20 UTC +Last updated 2008-09-13 06:06:59 UTC </div> </div> </body>
diff --git a/gitattributes.txt b/gitattributes.txt index 75124d2..6f3551d 100644 --- a/gitattributes.txt +++ b/gitattributes.txt
@@ -313,7 +313,7 @@ - `html` suitable for HTML/XHTML documents. -- `java` suitable for source code in the Java lanugage. +- `java` suitable for source code in the Java language. - `pascal` suitable for source code in the Pascal/Delphi language.
diff --git a/merge-config.txt b/merge-config.txt index 00277e0..c735788 100644 --- a/merge-config.txt +++ b/merge-config.txt
@@ -1,5 +1,5 @@ merge.stat:: - Whether to print the diffstat between ORIG_HEAD and merge result + Whether to print the diffstat between ORIG_HEAD and the merge result at the end of the merge. True by default. merge.log::
